Merge branch 'Schweigi:master' into master

Author: goodtune

oauth2client/contrib/django_util/models.py

@@ -64,7 +64,7 @@ def get_prep_value(self, value):
         if value is None:
             return None
         else:
-            return encoding.smart_text(
+            return encoding.smart_str(
                 base64.b64encode(jsonpickle.encode(value).encode()))
 
     def value_to_string(self, obj):