Merged revisions 300384 via svnmerge from