Merged revisions 168828 via svnmerge from