Image formats error #933
Merge remote-tracking branch 'upstream/master'
Merge pull request #938 from oliverds/master

Image formats error.