Merge branch 'refs/heads/2.0'
authorMatthias Schmidt <gravatronics@live.com>
Tue, 1 Jul 2014 19:10:31 +0000 (21:10 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 1 Jul 2014 19:10:31 +0000 (21:10 +0200)

Trivial merge