Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 5 Oct 2014 08:20:13 +0000 (10:20 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 5 Oct 2014 08:20:13 +0000 (10:20 +0200)

Trivial merge