Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 7 Feb 2015 15:26:55 +0000 (16:26 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 7 Feb 2015 15:26:55 +0000 (16:26 +0100)

Trivial merge