Merge branch 'develop'
Merge branch 'release-1.0'
Merge branch 'release-1.1'
Bumped version to 1.2
Merge branch 'release_1.2'
Fixed https references
Done merging in the hotfix