Merged revisions 11479 via svnmerge from