Implements #1269
Merge pull request #1270 from emmanuel-keller/1.5

Implements #1269