Merge branch '3.6' into fuzzy

This commit is contained in:
Christophe Nanteuil 2018-06-17 22:07:25 +02:00 committed by GitHub
commit 1f6fd6e557
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

File diff suppressed because it is too large Load diff