Merged revisions 308815 via svnmerge from