Monkey-merge pull request #970.