Merge with 3.5

diff --cc Lib/test/test_email/test_asian_codecs.py
index 42bb3e9ee3bfce9c9e5f5fe76cdb1a40237ce551,f9cd7d9b4ec1f8b282b4296b6a4fc6befd7309c5..1e0caeeaed0810a095cf99ce81b122841011d89f
--- 1/Lib/test/test_email/test_asian_codecs.py
--- 2/Lib/test/test_email/test_asian_codecs.py
+++ b/Lib/test/test_email/test_asian_codecs.py
@@@ -3,8 -3,9 +3,8 @@@
  # email package unit tests for (optional) Asian codecs
  
  import unittest
 -from test.support import run_unittest
  
- from test.test_email.test_email import TestEmailBase
+ from test.test_email import TestEmailBase
  from email.charset import Charset
  from email.header import Header, decode_header
  from email.message import Message