Merge branch 'release/3.1.2' 3.1.2
authorAlex Kellner <alexander.kellner@in2code.de>
Sun, 21 Feb 2016 18:45:11 +0000 (19:45 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Sun, 21 Feb 2016 18:45:11 +0000 (19:45 +0100)

Trivial merge