Merged revisions 308945 via svnmerge from