Merge remote-tracking branch 'upstream/master' into django-1.6

Conflicts:
	haystack/backends/elasticsearch_backend.py