Merged revisions 137731 via svnmerge from