Blocked revisions 244151 via svnmerge (fixed a different way in trunk and 1.6.x)