Pushed to master as:

aca7dcdd1eee3c879ef1cca2f417988fa0d12b03

2ab089b7ba531b0a28e9fe65a44a8a4af4b1d2bf

78754995e847115e5c9141521497b0b41319fc4b.