Merge branch 'snowblind-master'
authorFelix Morgner <felix.morgner@gmail.com>
Mon, 9 Nov 2015 08:48:39 +0000 (09:48 +0100)
committerFelix Morgner <felix.morgner@gmail.com>
Mon, 9 Nov 2015 08:48:39 +0000 (09:48 +0100)

Trivial merge