Merged revisions 152535 via svnmerge from