Merge branch 'release/4.6.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 13 Mar 2017 11:32:49 +0000 (12:32 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 13 Mar 2017 11:32:49 +0000 (12:32 +0100)

Trivial merge