Merged revisions 7797-7917 via svnmerge from