Merge branch 'master' into development
[BUGFIX] shrinkimage
Merge branch 'development'