Merged revisions 201261 via svnmerge from