On Ubuntu, replace underscores in branch name with dashes.
Merge branch 'master' into features_key