Merged revisions 168628 via svnmerge from