Merge #27782 fix from 3.5

author Nick Coghlan <ncoghlan@gmail.com>

Sun, 21 Aug 2016 07:43:58 +0000 (17:43 +1000)

committer Nick Coghlan <ncoghlan@gmail.com>

Sun, 21 Aug 2016 07:43:58 +0000 (17:43 +1000)
author Nick Coghlan <ncoghlan@gmail.com>
Sun, 21 Aug 2016 07:43:58 +0000 (17:43 +1000)
committer Nick Coghlan <ncoghlan@gmail.com>
Sun, 21 Aug 2016 07:43:58 +0000 (17:43 +1000)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_testmultiphase.c
Simple merge
diff --cc Objects/moduleobject.c
Simple merge
author	Nick Coghlan <ncoghlan@gmail.com>
	Sun, 21 Aug 2016 07:43:58 +0000 (17:43 +1000)
committer	Nick Coghlan <ncoghlan@gmail.com>
	Sun, 21 Aug 2016 07:43:58 +0000 (17:43 +1000)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_testmultiphase.c	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/moduleobject.c	patch \|	diff1 \|	diff2 \|	blob \| history