Merged revisions 169722 via svnmerge from