Merge pull request #867 from emmanuel-keller/1.6

Bug fix and improvement
Merge pull request #871 from emmanuel-keller/1.6

Implements #869
Merge pull request #929 from emmanuel-keller/1.6

Report August v1.5 bug fixes and improvement