Merge remote-tracking branch 'ac/elasticsearch_boosting' into panda_master
Merge branch 'elastiscearch_source_excluded' into panda_master

Conflicts:
	tests/elasticsearch_tests/tests/test_elasticsearch_backend.py