Merge branch 'master' into gsoc2017-php7-classes-via-c-api