Merge remote-tracking branch 'origin/next' into next
authorMatthias Schmidt <gravatronics@live.com>
Thu, 4 Aug 2016 16:19:30 +0000 (18:19 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 4 Aug 2016 16:19:30 +0000 (18:19 +0200)

Trivial merge