bumped ES to 0.20.2
Merge branch 'develop' into otter