Merged revisions 33466 via svnmerge from