Merged revisions 308991 via svnmerge from