Missing files for #920
Merge pull request #922 from emmanuel-keller/1.5

Missing files for #920