Merge branch 'release/4.2.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 6 Jul 2016 15:06:12 +0000 (17:06 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 6 Jul 2016 15:06:12 +0000 (17:06 +0200)

Trivial merge