diff --git a/setup.py b/setup.py
index a20a28b2b..13749203a 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ except ImportError:
 
 # Our version ALWAYS matches the version of Django we support
 # If Django has a new release, we branch, tag, then update this setting after the tag.
-version = '1.10.1'
+version = '1.10.7'
 
 if sys.argv[-1] == 'tag':
     os.system('git tag -a %s -m "version %s"' % (version, version))
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 3b51ae328..fc00cd009 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -12,8 +12,6 @@ Local settings
 - Add django-extensions as app
 """
 
-import socket
-import os
 from .base import *  # noqa
 
 # DEBUG
@@ -55,6 +53,9 @@ INSTALLED_APPS += ['debug_toolbar', ]
 
 INTERNAL_IPS = ['127.0.0.1', '10.0.2.2', ]
 {% if cookiecutter.use_docker == 'y' %}
+{# [cookiecutter-django] This is a workaround to flake8 "imported but unused" errors #}
+import socket
+import os
 # tricks to have debug toolbar when developing with docker
 if os.environ.get('USE_DOCKER') == 'yes':
     ip = socket.gethostbyname(socket.gethostname())