Merge work from ctrompette for DropBox API v1 support