Merged revisions 137987 via svnmerge from