Manually applied pull request #61