Pushed as ec23b6ec04..31fed85aa8 to master.