Merged revisions 168546 via svnmerge from