Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 26 Jul 2014 08:32:29 +0000 (10:32 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 26 Jul 2014 08:32:29 +0000 (10:32 +0200)

Trivial merge