Merge remote-tracking branch 'origin/master' into release
Merge branch 'release' of https://github.com/ericschultz/flaming-ninja into release