Suppress test failure with MySQL 5.7
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'