Merge from origin/emacs-24
The following commit was skipped:
ae3d733
Backport 20156 fix (stack corruption)
This commit is contained in:
commit
821b600212
The following commit was skipped:
ae3d733
Backport 20156 fix (stack corruption)