Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Tue, 2 Sep 2014 18:59:51 +0000 (20:59 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 2 Sep 2014 18:59:51 +0000 (20:59 +0200)

Trivial merge