Merged revisions 19812 via svnmerge from