Merged revisions 310587 via svnmerge from