bug#22891:

[Eli Zaretskii]

> Date: Tue, 26 Apr 2016 21:10:58 +0200
> From: Anders Lindgren <andlind@gmail.com>
> Cc: 22891@debbugs.gnu.org, Constantine Vetoshev <vetoshev@gmail.com>
> 
>  The fix for bug#22891 should go into emacs-25. Otherwise, we release code
>  that worked for emacs 24.5.
> 
> I just pushed this to master. See
> http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=5b5403289888efe8783ae6a405845b925f544ec1
>  for
> details.
> 
> If you think this is important enough to go into emacs-25, please merge it to 
> that branch as well.

Cherry-pick, not merge.  With a "backport" in the log message, please.