That'll do for today, it's Sunday after all.
Merge branch 'cleaner'