Import Upstream version 4.12.4

doc/api/Str.md

@@ -0,0 +1,14 @@
+[//]: # (THE CONTENT BELOW IS GENERATED. DO NOT EDIT.)
+.. _Str:
+
+# Str
+[//]: # (ADD YOUR NOTES BELOW. THESE WILL BE PICKED EVERY TIME THE DOCS ARE REGENERATED. //end)
+
+A parameter for Unicode text (stored in the ``unicode`` type).
+
+This class is named `Str` instead of `Unicode` so it's aligned with the
+Python v3 ``(str, unicode) => (bytes, str)`` clean-up.  
+
+See: http://docs.python.org/3.0/whatsnew/3.0.html
+
+Also see the `Bytes` parameter.