I’ve put in a PR for this here:
https://github.com/discourse/discourse/pull/3943
Further feedback welcome!
