Merged to trunk in r18131.