Bump version
Merge branch 'master' into email-alerts