Merge issue #24129 from 3.5

author Nick Coghlan <ncoghlan@gmail.com>

Wed, 5 Aug 2015 13:24:55 +0000 (23:24 +1000)

committer Nick Coghlan <ncoghlan@gmail.com>

Wed, 5 Aug 2015 13:24:55 +0000 (23:24 +1000)
author Nick Coghlan <ncoghlan@gmail.com>
Wed, 5 Aug 2015 13:24:55 +0000 (23:24 +1000)
committer Nick Coghlan <ncoghlan@gmail.com>
Wed, 5 Aug 2015 13:24:55 +0000 (23:24 +1000)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Nick Coghlan <ncoghlan@gmail.com>
	Wed, 5 Aug 2015 13:24:55 +0000 (23:24 +1000)
committer	Nick Coghlan <ncoghlan@gmail.com>
	Wed, 5 Aug 2015 13:24:55 +0000 (23:24 +1000)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history