Merge pull request #13638 from neheb/imgma