Merged revisions 68401 via svnmerge from