beta 4
Merge branch 'master' of https://github.com/owncloud/core