Merge branch 'release/1.1.1' into develop
Merge branch 'master' of https://github.com/jameswragg/Dropit into develop
Merge branch 'release/1.1.2'