Merge tag 'release-1.0' into develop

Course template updates
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'release/release-1.1'