Merged in 9b316a0.