Merge branch 'master' into treyhunner-extra-attributes

Conflicts:
	parsley/decorators.py

parsley/decorators.py

@@ -7,7 +7,7 @@ def parsleyfy(klass):
 
     def new_init(self, *args, **kwargs):
         old_init(self, *args, **kwargs)
-        for _, field in self.fields.iteritems():
+        for _, field in self.fields.items():
             if field.required:
                 field.widget.attrs.update({"data-required": "true"})
             if isinstance(field, forms.URLField):