Pushed as 27b339702f601d2635416111930843a32dd625ed to master.