Merged in b40eced515.