Pushed as 994b82a78b109b8ff43fff168f673685c69dc86d to master.