Experimental Dropbox branch v2.5.x

Dropbox v2.5.37 included here