Merged in to trunk in r18131.