Fix capitalization of Dropbox
fixing merge conflict
Merge pull request #1950 from mollybostic/master_0710

fixing merge conflict