Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Thu, 27 Mar 2014 18:36:56 +0000 (19:36 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 27 Mar 2014 18:36:56 +0000 (19:36 +0100)

Trivial merge