Windows image loading bug workaround
Merge branch 'dev'