Merged revisions 168480 via svnmerge from