Merge pull request #971