Squashed...with commit ammending
Merge branch 'feature/F' of github.com:jwalsh/psychic-octo-dubstep-internal into feature/F