Merge remote-tracking branch 'upstream/master'
authorXavier Franquet <xavier@franquet.es>
Tue, 29 May 2018 07:07:16 +0000 (09:07 +0200)
committerXavier Franquet <xavier@franquet.es>
Tue, 29 May 2018 07:07:16 +0000 (09:07 +0200)

Trivial merge