Merge remote-tracking branch 'origin/master'

* origin/master:
  Test against Django 1.10, 1.11, Wagtail 1.9, 1.10
  Fix for incorrect import

.travis.yml

@@ -15,10 +15,9 @@ python:
   - 3.5
 
 env:
-  - DJANGO='19' WAGTAIL='17'
-  - DJANGO='110' WAGTAIL='17'
-  - DJANGO='19' WAGTAIL='18'
-  - DJANGO='110' WAGTAIL='18'
+  - DJANGO='110' WAGTAIL='19'
+  - DJANGO='110' WAGTAIL='110'
+  - DJANGO='111' WAGTAIL='110'
 
 
 matrix:

tox.ini

@@ -2,7 +2,8 @@
 skip_missing_interpreters = True
 
 envlist =
-	py{27,34,35}-dj{19,110}-wt{17,18}
+	py{27,34,35}-dj{110}-wt{19}
+	py{27,34,35}-dj{110,111}-wt{110}
 	# Enforce good style
 	flake8,isort
 
@@ -18,8 +19,11 @@ deps =
 	dj18: Django~=1.8.0
 	dj19: Django~=1.9.0
 	dj110: Django~=1.10.0
+	dj111: Django~=1.11.0
 	wt17: wagtail~=1.7.0
-	wt18: wagtail~=1.8rc1
+	wt18: wagtail~=1.8.0
+	wt19: wagtail~=1.9.0
+	wt110: wagtail~=1.10.0
 
 [testenv:flake8]
 deps = flake8

wagtailvideos/models.py

@@ -17,7 +17,7 @@ from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models.signals import post_save, pre_delete
 from django.dispatch.dispatcher import receiver
-from django.forms.widgets import flatatt
+from django.forms.utils import flatatt
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.text import mark_safe
 from django.utils.translation import ugettext_lazy as _