Manual merge of PEP 366 implementation from trunk (the automatic merge choked on the PyString->PyUnicode changes)