Merge branch 'hotfix/1.0.3' into develop
Merge branch 'master' into develop
quick change to copy
Merge branch 'hotfix/1.0.4'
Merge branch 'hotfix/1.0.4' into develop
Merge branch 'develop'