Add support for dev versions in build script
Merge remote-tracking branch 'origin/master'