Merge branch 'hotfix/v1.2.1' into develop
Merge pull request #1 from mguilarducci/develop

Merge branch 'hotfix/v1.2.1' into develop