Merge remote-tracking branch 'origin/master' into feature/android

diff --cc lisp/files.el
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
index b815a1bdd793d595401a000b331c0141f6c2e3bf,18879aa8fa345107d75241d212d46bf33a780dc6..290481c2b5dc3761d83e57bb7eb6c19dc9867e29
--- 1/src/fileio.c
--- 2/src/fileio.c
+++ b/src/fileio.c
@@@ -2572,10 -2470,10 +2573,11 @@@ If file has multiple names, it continue
  {
    Lisp_Object encoded_file;
  
+   filename = Fexpand_file_name (filename, Qnil);
    encoded_file = ENCODE_FILE (filename);
  
 -  if (unlink (SSDATA (encoded_file)) != 0 && errno != ENOENT)
 +  if (emacs_unlink (SSDATA (encoded_file)) != 0
 +      && errno != ENOENT)
      report_file_error ("Removing old name", filename);
    return Qnil;
  }