Merge from 3.5

author Steve Dower <steve.dower@microsoft.com>

Sat, 10 Sep 2016 18:53:34 +0000 (11:53 -0700)

committer Steve Dower <steve.dower@microsoft.com>

Sat, 10 Sep 2016 18:53:34 +0000 (11:53 -0700)
author Steve Dower <steve.dower@microsoft.com>
Sat, 10 Sep 2016 18:53:34 +0000 (11:53 -0700)
committer Steve Dower <steve.dower@microsoft.com>
Sat, 10 Sep 2016 18:53:34 +0000 (11:53 -0700)
diff --cc Lib/platform.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Steve Dower <steve.dower@microsoft.com>
	Sat, 10 Sep 2016 18:53:34 +0000 (11:53 -0700)
committer	Steve Dower <steve.dower@microsoft.com>
	Sat, 10 Sep 2016 18:53:34 +0000 (11:53 -0700)
		1	2
Lib/platform.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history