ref
Merge branch 'master' of github.com:flammie/purplemonkeydishwasher

Problems ahead...