Fixed, see http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=345a9c8cd07111a8c8367e59404688544e8b8b1d for details.