Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master