Merged revisions 11062,11089 via svnmerge from