Fixed image orientation problem
Merge branch 'hotfix-0.22'