Merge branch 'PHP-5.6'