Merge remote-tracking branch 'origin/next' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 10 Jul 2016 09:12:05 +0000 (11:12 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 10 Jul 2016 09:12:05 +0000 (11:12 +0200)

Trivial merge