Merge from 3.5 (#24543).

author Stefan Krah <skrah@bytereef.org>

Thu, 2 Jul 2015 18:28:45 +0000 (20:28 +0200)

committer Stefan Krah <skrah@bytereef.org>

Thu, 2 Jul 2015 18:28:45 +0000 (20:28 +0200)
author Stefan Krah <skrah@bytereef.org>
Thu, 2 Jul 2015 18:28:45 +0000 (20:28 +0200)
committer Stefan Krah <skrah@bytereef.org>
Thu, 2 Jul 2015 18:28:45 +0000 (20:28 +0200)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Stefan Krah <skrah@bytereef.org>
	Thu, 2 Jul 2015 18:28:45 +0000 (20:28 +0200)
committer	Stefan Krah <skrah@bytereef.org>
	Thu, 2 Jul 2015 18:28:45 +0000 (20:28 +0200)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history