Merge remote-tracking branch 'origin/7' into 8

This commit is contained in:
Sylvestre Ledru 2019-02-11 11:39:19 +01:00
commit f1a5a39d3d