Simplify
Merge branch '4.0'
Tweak
Merge branch '4.0'
Test with PHP 5.6
Merge branch '4.0'