Added E0611 to .pylintrc after pylint update is causing it to wrongfully spam that error code.
Merge branch 'master' into entities_changes