Merge branch 'php-53-upgrade'