Merge branch 'fix-pr8485-and-pr8526' into maint * fix-pr8485-and-pr8526: deps: partially revert commit `v1.11-512-geeee551'
2011-10-24T19:45:42