Merge Dropbox to upstream