Post release clean-up
Minor deployment configuration changes
Merge branch 'master' into tourapp
Minor deployment configuration changes