MDL-47494 ddimageortext: Merge pull request #1 from jamiepratt/master