Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 15:37:43 +0000 (17:37 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 15:37:43 +0000 (17:37 +0200)

Trivial merge