apparently needed by django 1.7
Merge branch 'object_classes'

Conflicts:
	ldapdb/models/fields.py