Merged revisions 300714 via svnmerge from