Merge from 3.5.

diff --cc Doc/c-api/unicode.rst
Simple merge

diff --cc Lib/test/test_unicode.py
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc Modules/_testcapimodule.c
Simple merge

diff --cc Objects/unicodeobject.c
Simple merge