Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 21 Dec 2015 10:27:20 +0000 (11:27 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 21 Dec 2015 10:27:20 +0000 (11:27 +0100)

Trivial merge