Fix self arg type when adding optional arguments in an override.
fix typo in docs

--HG--
extra : rebase_source : 4cc5a2b5b9044e06fca82d216aa5a3c919abf033
minor doc clarification
Merge branch '0.20.x'