Ianoc/scalding 210

Brings @jcoveney and my old stuff up to date
Yeah, not sure why/how it got in there really. Just started appearing in all my diffs