Merged revisions 186984 via svnmerge from