Match build number to branch

Mostly for my CI server #1523
Merge pull request #1534 from Goldman60/patch-1

Match build number to branch