Merged revisions 165317 via svnmerge from