Merge remote-tracking branch 'origin/next' into next
authorMatthias Schmidt <gravatronics@live.com>
Tue, 6 Sep 2016 19:10:24 +0000 (21:10 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 6 Sep 2016 19:10:24 +0000 (21:10 +0200)

Trivial merge