Merged in 6faad95.