Merge remote-tracking branch 'upstream/master' into dev
authorVincent Torri <vincent.torri@gmail.com>
Tue, 20 Nov 2018 19:41:56 +0000 (20:41 +0100)
committerVincent Torri <vincent.torri@gmail.com>
Tue, 20 Nov 2018 19:41:56 +0000 (20:41 +0100)

Trivial merge