typo and changed branch reference
Merge branch 'hotfix-stop-bothering-caitlin' into dev-dan