Merge branch 'master' into wip/better-php-parser