Merge branch 'develop' into 'master'

Update master

See merge request back-end/elastalert!29

Merge branch 'master' into 'develop'

Update develop

See merge request back-end/elastalert!24