Merge pull request #432 from carlossg/daily

[INFRA-729] Correctly determine what branch are we in, again