Merge branch 'master' into develop
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 13:33:33 +0000 (15:33 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 13:33:33 +0000 (15:33 +0200)

Trivial merge