Replace the '.' with '-' withing the version and build strings
Merge branch 'origin/master'