Merge branch 'release/3.1.1' 3.1.1
authorAlex Kellner <alexander.kellner@in2code.de>
Mon, 25 Jan 2016 18:19:29 +0000 (19:19 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Mon, 25 Jan 2016 18:19:29 +0000 (19:19 +0100)

Trivial merge