Fixes #596
Merge pull request #618 from emmanuel-keller/1.6

Fixes #596