Merge branch 'mm-map-updates' into s2
Merge branch 's2' of github.com:dimagi/core-hq into s2