Merge pull request #2372 from pulpe/dropbox_fix