Merged revisions 308903 via svnmerge from