merge develop into master

All of these changes should not affect any existing functionality.

This is necessary for https://github.com/dimagi/commcare-hq/pull/2383