[post] Rake
Merge branch 'rake'
[post] Kindness: tweaks after reading it the next day
Merge branch 'kindness'