Now less smarmy.
Merge branch 'WIP'