Merge branch 'release/3.2.1' master 3.2.1
authorAlex Kellner <alexander.kellner@in2code.de>
Tue, 23 Aug 2016 12:54:41 +0000 (14:54 +0200)
committerAlex Kellner <alexander.kellner@in2code.de>
Tue, 23 Aug 2016 12:54:41 +0000 (14:54 +0200)

Trivial merge