@b4n approved this pull request.
LGTM! :tada: :partying_face:
04eec181710a1e8537b7f4f83e98658e3cf18907, 2927ec4dbb139528a07209d551897098425f3ebe, 99a993fbfed30075610a30432ffe5ae1c3ae2fc3, 3847b6c2a9e090a3362d35dac51c3859f628cacd and ccd5330a21318a0f39bcaf330dac1188e25ab6aa could be squashed in 353ceff30518ea0291a1f8cae279d66dd0a1c469 if you like, but it's fine with me as is -- and possibly even better, I'm not completely sure which way I like best.
Apart from that, there's basically no change in the non-main part diff, so there's not much to add to v4 :)
I'll also try and take a look at importing upstream bundled regex library to at least get Jenkins happy, and we can always use another dep later -- unless @codebrainz or @eht16 have another solution at hand?