Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Tue, 23 Dec 2014 17:46:02 +0000 (18:46 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 23 Dec 2014 17:46:02 +0000 (18:46 +0100)

Trivial merge