Merge remote-tracking branch 'upstream/master'
Ferruccio Zamuner [Wed, 25 Oct 2017 10:00:31 +0000 (12:00 +0200)]

Trivial merge