Merge branch 'release/3.0.0' 3.0.0
authorAlex Kellner <alexander.kellner@in2code.de>
Mon, 14 Sep 2015 11:11:25 +0000 (13:11 +0200)
committerAlex Kellner <alexander.kellner@in2code.de>
Mon, 14 Sep 2015 11:11:25 +0000 (13:11 +0200)

Trivial merge