#653
Merge pull request #698 from emmanuel-keller/1.5

#653