Blocked r60970 with svnmerge.