Merged revisions 86405 via svnmerge from