Manually merge pull request #111