Merge pull request #6779 from nupplaphil/issue/6498-image_rotation