Fixes #860
Merge branch 'master' of github.com:kyleconroy/hawkthorne-journey