Prepare release
Fix BC break introduced in 7dadedf6c770feb18c0e17d895e698d57a6fb9bb (see https://github.com/sebastianbergmann/phpunit/pull/1236)
Travis CI has updated HHVM to 3.0.1
Fix skip condition
Merge branch '4.0' into 4.1
Closes #1193
Merge branch '4.0' into 4.1
Merge branch '4.1'