Allow building a specific branch
Merge branch 'master' into v5