Merge branch 'hotfix-1.3.2' into develop
fixed bug stopping access to non-existent image data
Merge branch 'develop'