Rebase from upstream
Upgrade from upstream
Update Pylintrc to ignore W0621: redefining variable from outer scope
Update Pylintrc to ignore C0111: missing docstring; update comments
Merge branch 'master' into zsh_no_source