Merge branch 'release/3.6.0'
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 4 Jun 2015 12:41:14 +0000 (14:41 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 4 Jun 2015 12:41:14 +0000 (14:41 +0200)

Trivial merge