Merged revisions 307467 via svnmerge from