diff --git a/lms/djangoapps/survey/models.py b/lms/djangoapps/survey/models.py
index 52b3bc6955..9ef3590737 100644
--- a/lms/djangoapps/survey/models.py
+++ b/lms/djangoapps/survey/models.py
@@ -164,7 +164,6 @@ class SurveyForm(TimeStampedModel):
 
 
 class SurveyAnswer(TimeStampedModel):
-    # pylint: disable=line-too-long
     """
     Model for the answers that a user gives for a particular form in a course
 
diff --git a/pylintrc b/pylintrc
index 725a031296..717c2ce574 100644
--- a/pylintrc
+++ b/pylintrc
@@ -373,7 +373,7 @@ docstring-min-length = 5
 
 [FORMAT]
 max-line-length = 120
-ignore-long-lines = ^\s*(# )?<?https?://\S+>?$
+ignore-long-lines = ^\s*(# )?((<?https?://\S+>?)|(\.\. pii: .*))$
 single-line-if-stmt = no
 no-space-check = trailing-comma,dict-separator
 max-module-lines = 1000
@@ -446,4 +446,4 @@ int-import-graph =
 [EXCEPTIONS]
 overgeneral-exceptions = Exception
 
-# ddfc2b6fc6acff4fdfcc76ecb982aa840035d86f
+# bb786547d45a1ec1adda9b687d900083dd57603b
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index c2496cd198..9a7498cd04 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -137,7 +137,7 @@ edx-django-utils==1.0.3
 edx-drf-extensions==2.0.1
 edx-enterprise==1.2.12
 edx-i18n-tools==0.4.8
-edx-lint==1.1.0
+edx-lint==1.1.1
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in
index d4ce3d011d..ed6dc834c0 100644
--- a/requirements/edx/testing.in
+++ b/requirements/edx/testing.in
@@ -25,7 +25,7 @@ code-annotations          # Perform code annotation checking, such as for PII an
 cssselect                 # Used to extract HTML fragments via CSS selectors in 2 test cases and pyquery
 ddt                       # Run a test case multiple times with different input; used in many, many of our tests
 edx-i18n-tools>=0.4.6     # Commands for developers and translators to extract, compile and validate translations
-edx-lint==1.1.0           # pylint extensions for Open edX repositories
+edx-lint==1.1.1           # pylint extensions for Open edX repositories
 factory_boy==2.8.1        # Library for creating test fixtures, used in many tests
 freezegun                 # Allows tests to mock the output of assorted datetime module functions
 httpretty                 # Library for mocking HTTP requests, used in many tests
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 9dfc125618..1688d41ca7 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -133,7 +133,7 @@ edx-django-utils==1.0.3
 edx-drf-extensions==2.0.1
 edx-enterprise==1.2.12
 edx-i18n-tools==0.4.8
-edx-lint==1.1.0
+edx-lint==1.1.1
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4