Block r60962 with svnmerge.