oauthlib

Merge proposals dependent on lp://qastaging/~matt-goodall/oauthlib/fix-dict-encode-bug

  1. fix-dict-encode-bug
  2. Dependent merge proposals

lp://qastaging/~matt-goodall/oauthlib/fix-dict-encode-bug has no merge proposals.