Merge pull request #1246 from bradymiller/php7-fixes_1