cherry-picked missing 4.13 commits to 5.x branch

[James Taylor]

I cherry-picked the missing commits that are in 4.13 over to the 5.x
branch. I'd vote that we keep master in sync with the 5.x branch as much as
possible. So please make sure to commit to both branches.

Thanks,
James