Merge branch 'release/1.1.0'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'release/1.2.0'
bump
Merge branch 'release/1.2.1'
Merge branch 'release/1.2.1' into develop
Merge branch 'develop' of github.com:seivan/SHControlBlocks into develop
Merge branch 'release/1.2.1'