Implements #1114
Merge pull request #1115 from emmanuel-keller/1.5

Implements #1114