merge with owncloud-develop