Fixed mangled merge
Merge branch 'master' of https://github.com/fatiguedartist/change-of-heart