Merge owncloud/core