Merge from origin/emacs-25

author Paul Eggert <eggert@cs.ucla.edu>

Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)

committer Paul Eggert <eggert@cs.ucla.edu>

Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)
author Paul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)
committer Paul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)
diff --cc etc/NEWS
Simple merge
diff --cc src/image.c
Simple merge
author	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/image.c	patch \|	diff1 \|	diff2 \|	blob \| history