Merge pull request #3131 from mhei/php7