Merge pull request #611.