Merge branch 'hotfix/4.5.1' 4.5.1
authorjenkins <jenkins-int@bgbm.org>
Wed, 25 Jan 2017 09:23:34 +0000 (10:23 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 25 Jan 2017 09:23:34 +0000 (10:23 +0100)

Trivial merge