Implements #1207
Merge pull request #1208 from emmanuel-keller/1.5

Implements #1207