Merged in c8fa4c8.