; Merge from origin/emacs-25

The following commits were skipped:

a6e0a67 gitmerge: Add cherry pick to gitmerge-skip-regexp
fb12af2 ; Merge: some backports from master
6234012 Don't require isearch-update before isearch-done
5e50114 Avoid error in icalendar--read-element
ace9d22 Make a menu less ambiguous
e683495 Doc fix for url-http