Issue #28616: merge from 3.5

author Ned Deily <nad@python.org>

Fri, 4 Nov 2016 21:07:06 +0000 (17:07 -0400)

committer Ned Deily <nad@python.org>

Fri, 4 Nov 2016 21:07:06 +0000 (17:07 -0400)
author Ned Deily <nad@python.org>
Fri, 4 Nov 2016 21:07:06 +0000 (17:07 -0400)
committer Ned Deily <nad@python.org>
Fri, 4 Nov 2016 21:07:06 +0000 (17:07 -0400)
diff --cc Misc/ACKS
Simple merge
diff --cc Python/sysmodule.c
Simple merge
author	Ned Deily <nad@python.org>
	Fri, 4 Nov 2016 21:07:06 +0000 (17:07 -0400)
committer	Ned Deily <nad@python.org>
	Fri, 4 Nov 2016 21:07:06 +0000 (17:07 -0400)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/sysmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history