manually merge pull request #1121