Fixes flovan/headstart#47
Merge branch 'patch-release-v1.2.1'
Merge branch 'master' into major-release-v2