Merge "Bug 41234 - api prop=imageinfo broken on PHP 5.4"