Merge branch 'next' into next-lantia
authorMatthias Schmidt <gravatronics@live.com>
Wed, 23 Dec 2015 08:32:00 +0000 (09:32 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 23 Dec 2015 08:32:00 +0000 (09:32 +0100)

Trivial merge