Merge branch 'next' into next-lantia
authorMatthias Schmidt <gravatronics@live.com>
Tue, 22 Dec 2015 12:23:53 +0000 (13:23 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 22 Dec 2015 12:23:53 +0000 (13:23 +0100)

Trivial merge