Merge pull request #920