Merge branch 'refs/heads/2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 31 May 2014 11:38:49 +0000 (13:38 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 31 May 2014 11:38:49 +0000 (13:38 +0200)

Trivial merge