cc @pthiess @ingorichter
Includes the changes from #11283, which we unfortunately cannot merge ourselves. As the changes are not that substantial, from what I can tell there's no copyright on them.
I hope that's ok with you, @MarcoWilli.
LGTM. Thank you.
Everything fine! =)