merge request for the owncloud-addon