Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 14 Mar 2016 17:40:52 +0000 (18:40 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 14 Mar 2016 17:40:52 +0000 (18:40 +0100)

Trivial merge