Merge branch 'christopheNan-chriscontrib' into 3.6

This commit is contained in:
Julien Palard 2018-01-30 11:39:28 +01:00
commit f86520ecbe

File diff suppressed because it is too large Load Diff