Merge branch 'release-1.2.1'
forgot line terminator in replacement pattern
bump version to 1.2.2
Merge branch 'hotfix-fix121' into develop