This overlaps with !6 (merged) though, so in case that one gets merged soon, there's no point in this one.
@janne @ePirat