Pushed as 586136d127..aa6e6fb2e9 to master.