Merged revisions 11528 via svnmerge from