Merge branch 'develop'
Merge branch 'develop'
Corrected make release script
Merge branch 'master' into develop