Fix display of deployed version
Merge branch 'master' into production