Merge from origin/emacs-24

The following commit was skipped:

ae3d733 Backport 20156 fix (stack corruption)
This commit is contained in:
Paul Eggert 2015-03-23 10:16:40 -07:00
commit 821b600212

Diff content is not available