Use Elasticsearch 1.3 on staging
Merge branch 'develop' into staging