Merged revisions 308242 via svnmerge from