Merge branch 'release/4.5.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 19 Jan 2017 11:14:39 +0000 (12:14 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 19 Jan 2017 11:14:39 +0000 (12:14 +0100)

Trivial merge