Pushed as f427ec7026..2173e4a12e to master.