Experimental Dropbox branch v2.5.x

Dropbox v2.5.37 included here
Merge pull request #27 from rolandwalker/dropbox-2.5.x

Experimental Dropbox branch v2.5.x