Merge branch 'release/1.0' into develop
Minor fixes. Moved to 1.01
Merge branch 'release/1.01' into develop
Merge branch 'release/1.01'
Merge branch 'develop'