Merged revisions 162804 via svnmerge from