Other backports from default.

--HG--
branch : pylint-1.3
3 files changed