Pushed as 791578befb7e129f682f38bfe903c23baa46fb91 to master.