Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Tue, 21 Feb 2017 17:30:46 +0000 (18:30 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 21 Feb 2017 17:30:46 +0000 (18:30 +0100)

Trivial merge