Merge with owncloud:master