port 5.x fixes to master branch?

[James Taylor]

There's a bunch of commits going into 5.x branch (which is great), but I
don't see those being back ported to our master branch. Would it be
possible to do that so we can keep the 4.x line in line with 5.x as much as
possible?