ENABLE_ELASTICSEARCH in local settings now
Merge remote-tracking branch 'origin/master'