Merge branch 'code-style' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 10 Jun 2016 16:02:22 +0000 (18:02 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 10 Jun 2016 16:02:22 +0000 (18:02 +0200)

Trivial merge