I rebased it on master, fixed the merge conflicts and tweaked the commit message a bit.

—
Reply to this email directly or view it on GitHub.