Merge master branch from 'RandolfCarter/owncloud'