Merge branch 'hotfix/3.6.1'
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:56 +0000 (18:16 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:56 +0000 (18:16 +0200)

Trivial merge