Merge branch 'hotfix/1.0.6' into develop
Merge branch 'master' into develop

Incorporating changes made to master by keruzu.
Merge branch 'release/1.0.7'