Implements #704
Merge pull request #705 from emmanuel-keller/1.5

Implements #704