Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 25 Mar 2016 07:52:29 +0000 (08:52 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 25 Mar 2016 07:52:29 +0000 (08:52 +0100)

Trivial merge