merge request owncloud 7.05