Merged revisions 33993 via svnmerge from