Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 16:27:22 +0000 (17:27 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 16:27:22 +0000 (17:27 +0100)

Trivial merge