Merge branch 'release/1.2.0'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Testing an update via Dploy.io