Merge pull request #16756 from mhei/php7-update