Merge commit '083a50a3' into eclair-mr2 * commit '083a50a3': fix sync exponential backoff for expedited syncs