Merge branch 'hotfix/v0.6.2' into develop
Merge remote-tracking branch 'origin/feature/mathpackage' into feature/mathpackage