Implements #1255
Merge pull request #1258 from emmanuel-keller/1.6

Implements #1255