Comment 14 for bug 1786574

Oh somehow I failed to notice the merge proposal on here, sorry about that. It's all fairly trivial though...