resolved file length bug
Merge remote-tracking branch 'origin/Dropbox' into Dropbox