Synchronised with upstream.
Merge pull request #1 from proiel/master

Synchronised with upstream.