Merge remote-tracking branch 'upstream/master' into dev
authorVincent Torri <vincent.torri@gmail.com>
Sun, 2 Dec 2018 17:46:14 +0000 (18:46 +0100)
committerVincent Torri <vincent.torri@gmail.com>
Sun, 2 Dec 2018 17:46:14 +0000 (18:46 +0100)

Trivial merge