Midnightchickenrun into midnight-snack

Merging a little past midnight, close to final master