Fixed per:
https://github.com/discourse/discourse/commit/adbc22530cbc25395cb4e16ad12913ee3bacbbaa
https://github.com/discourse/discourse/commit/ed750cac39a3bb7e94a6f0f0215e52bb994024f3
raise new specific bug reports (1 per issue) if anything else is left