Merged revisions 162659 via svnmerge from