Merge remote-tracking branch 'dweismueller/owncloud-7' into next