Merged revisions 168593 via svnmerge from