Pushed as 44cd0a4f37..1a36fb51a8 to master.