Merged revisions 33294 via svnmerge from