Merged revisions 12792 via svnmerge from