Merge remote-tracking branch 'origin/2.1'
authorDaniel Molkentin <danimo@owncloud.com>
Wed, 10 Feb 2016 11:57:03 +0000 (12:57 +0100)
committerDaniel Molkentin <danimo@owncloud.com>
Wed, 10 Feb 2016 11:57:03 +0000 (12:57 +0100)

Trivial merge