Merged revisions 168507 via svnmerge from