Test with PHP 5.6
Merge branch '1.2' into 2.0