Merge from 3.5

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

diff --cc Lib/test/test_warnings/data/import_warning.py
index 0000000000000000000000000000000000000000,d6ea2ce1046e9444ae55232dc6537c3b5ba15db0..32daec1140454aa29371d16bc7a51f7cf6bdbc1c
mode 000000,100644..100644
--- /dev/null
--- 2/Lib/test/test_warnings/data/import_warning.py
+++ b/Lib/test/test_warnings/data/import_warning.py
@@@ -1,0 -1,3 +1,3 @@@
 -warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)
+ import warnings
+ 
++warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)

diff --cc Misc/NEWS
Simple merge