Merged with mainline at revision 126229.