Merge pull request #10126 from stefaang/php7-mod-gd