Merge branch 'hotfix/0.12.1'
checkout branch before doing a pull
Merge branch 'hotfix/0.12.2' into develop