Block r60713 with svnmerge.