Pushed to master as f8279ba46baa5a1ad7e6c32546d71819eff72e4e.