I just fixed this, see the following for details:

    http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=1143016d04d8a0c5df467022d7208b71d593fd90

    -- Anders