Merge branch 'hotfix/1.0.1' into develop
Add support for placeholder images
Merge branch 'release/1.1.0'