Merge pull request #1006