Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 19 Jan 2017 11:13:29 +0000 (12:13 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 19 Jan 2017 11:13:29 +0000 (12:13 +0100)

Trivial merge