f3ab5c6b32
Merge commit '86ef717e2660dbc914dcf68295fbf9943c45bc44' * commit '86ef717e2660dbc914dcf68295fbf9943c45bc44': Change the DropBoxManager API slightly (this is public, but not yet released) --