Merge branch 'release-1.1'
Merge branch 'develop'
Merge branch 'release-1.2.0'
Removed password in initial text of a new pad
Merge branch 'hotfix-1.2.1' into develop