Merged revisions 41827 via svnmerge from