Carry the provider ID in API exceptions
Merge remote-tracking branch 'upstream/master' into AutoReconnect
Merged in 1.1.0.M2 changes
Fixed merge problem in comment