Merged revisions 18866 via svnmerge from