Manually merged pull request #222