Merge branch 'pylint'