Merge branch 'release/3.2.0' 3.2.0
authorAlex Kellner <alexander.kellner@in2code.de>
Thu, 12 May 2016 14:07:28 +0000 (16:07 +0200)
committerAlex Kellner <alexander.kellner@in2code.de>
Thu, 12 May 2016 14:07:28 +0000 (16:07 +0200)

Trivial merge