Merged revisions 30296 via svnmerge from