Merge branch 'hotfix/4.5.1' 4.5.1
authorjenkins <jenkins-int@bgbm.org>
Tue, 24 Jan 2017 15:09:55 +0000 (16:09 +0100)
committerjenkins <jenkins-int@bgbm.org>
Tue, 24 Jan 2017 15:09:55 +0000 (16:09 +0100)

Trivial merge