Implements #710
Merge pull request #711 from emmanuel-keller/1.5

Implements #710