Fix @@VERSION@@ replacement not to be "dirty"
Merge branch 'fix-deployment-process'