Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Github-Pull: #6224 Rebased-From: bfc30b34374d71928acee5ff41282f09cedfd5e4 6b1066fab41523d25d75b45a10e4b0f61d7c61d0 04b5d235f1560b8285591b963d3636f7ddf74563 59b49cd07482494d9a99068af502be9ceda41ed2
Github-Pull: #5875 Rebased-From: aa8c827968a68a3adc4df5f126635e37a71a7fbb