Merged revisions 215682 via svnmerge from