This is now merged to master with 64eaa2a65, though it's fine to repeat this here.