6.0.2 RC1
Merge branch 'stable6' of https://github.com/owncloud/core into stable6