Merge branch 'release/1.2.0'
Merge branch 'release/1.2.1'
Update CHANGELOG.md
Merge branch 'master' of https://github.com/davblayn/boarderline into develop