Merged revisions 167840 via svnmerge from