Project issue #900.
- Removed double declaration.
Merge pull request #104 from dterweij/6.1.x

Project issue #900.