Remove some unused constants.
Inject build number into output filename.
Merge branch 'develop'