Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Fri, 25 Apr 2014 14:01:15 +0000 (16:01 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 25 Apr 2014 14:01:15 +0000 (16:01 +0200)

Trivial merge