Merged revisions 11607 via svnmerge from