Backported things removed from Django 1.6.
Conflicts:
	haystack/backends/__init__.py