Merged revisions 9493,9528 via svnmerge from