Block r60932 with svnmerge.