Merge from 3.6

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

Sun, 20 Nov 2016 02:41:31 +0000 (18:41 -0800)

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

Sun, 20 Nov 2016 02:41:31 +0000 (18:41 -0800)
author Steve Dower <steve.dower@microsoft.com>
Sun, 20 Nov 2016 02:41:31 +0000 (18:41 -0800)
committer Steve Dower <steve.dower@microsoft.com>
Sun, 20 Nov 2016 02:41:31 +0000 (18:41 -0800)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/posixmodule.c
Simple merge
author	Steve Dower <steve.dower@microsoft.com>
	Sun, 20 Nov 2016 02:41:31 +0000 (18:41 -0800)
committer	Steve Dower <steve.dower@microsoft.com>
	Sun, 20 Nov 2016 02:41:31 +0000 (18:41 -0800)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/posixmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history