Implements #1162
Merge pull request #1178 from emmanuel-keller/1.5

Implements #1162