Merged revisions 164977 via svnmerge from