Merge branch 'release/3.1.3' 3.1.3
authorAlex Kellner <alexander.kellner@in2code.de>
Tue, 10 May 2016 13:10:02 +0000 (15:10 +0200)
committerAlex Kellner <alexander.kellner@in2code.de>
Tue, 10 May 2016 13:10:02 +0000 (15:10 +0200)

Trivial merge