Merged revisions 287931 via svnmerge from