Merge branch 'release/3.0.3' 3.0.3
authorAlex Kellner <alexander.kellner@in2code.de>
Mon, 9 Nov 2015 10:55:51 +0000 (11:55 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Mon, 9 Nov 2015 10:55:51 +0000 (11:55 +0100)

Trivial merge