Merge branch '3.0' into 3.1

* 3.0:
  [ci] Upgrade phpunit wrapper deps

Author: nicolas-grekas

phpunit

@@ -11,7 +11,7 @@
  */
 
 // Please update when phpunit needs to be reinstalled with fresh deps:
-// Cache-Id-Version: 2016-03-25 09:45 UTC
+// Cache-Id-Version: 2016-06-29 13:45 UTC
 
 use Symfony\Component\Process\ProcessUtils;