Updated pull request. Solved conflicts after c73b9cd.

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