Merged revisions 162348 via svnmerge from