fix bug where new branch would not be checked out
Merge branch 'master' into 67-missing-routes