Merge remote-tracking branch 'origin/master'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 19 Nov 2017 09:24:58 +0000 (10:24 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 19 Nov 2017 09:24:58 +0000 (10:24 +0100)

Trivial merge