diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 8cff96621..52c7cacd4 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -8,7 +8,7 @@ ______ _____ _____ _____    __
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.6.0'
+__version__ = '3.6.1'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2017 Tom Christie'
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index dbc5731cb..45ac49841 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -249,6 +249,7 @@ try:
         return md.convert(text)
 except ImportError:
     apply_markdown = None
+    markdown = None
 
 
 try: