Merged revisions 7963 via svnmerge from