Merge branch 'next' into next-lantia
authorMatthias Schmidt <gravatronics@live.com>
Tue, 24 Nov 2015 20:49:42 +0000 (21:49 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 24 Nov 2015 20:49:42 +0000 (21:49 +0100)

Trivial merge