Merge owncloud:master