Merged revisions 311687 via svnmerge from