Merge remote-tracking branch 'origin/next' into next
authorMatthias Schmidt <gravatronics@live.com>
Tue, 16 Aug 2016 15:32:59 +0000 (17:32 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 16 Aug 2016 15:32:59 +0000 (17:32 +0200)

Trivial merge