Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 11 Jun 2017 09:13:23 +0000 (11:13 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 11 Jun 2017 09:13:23 +0000 (11:13 +0200)

Trivial merge