Commit msg tweaked by rht. Based on https://github.com/zulip/zulip/pull/3318. Content tweaked by tabbott.