Merged revisions 162463 via svnmerge from