Merge crap
Merge branch 'master' of https://github.com/mostly-harmless/radiant
Regression merge