Merged revisions 308622 via svnmerge from