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

diff --cc .gitignore
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc admin/merge-gnulib
Simple merge

diff --cc configure.ac
Simple merge

diff --cc etc/DEBUG
Simple merge

diff --cc lib-src/Makefile.in
Simple merge

diff --cc lib/Makefile.in
Simple merge

diff --cc lib/faccessat.c
Simple merge

diff --cc lib/fpending.c
Simple merge

diff --cc lib/open.c
Simple merge

diff --cc lib/unistd.c
Simple merge

diff --cc lisp/cus-edit.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/image/wallpaper.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/epaths.in
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/filelock.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/font.c
Simple merge

diff --cc src/font.h
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/scroll.c
Simple merge

diff --cc src/sysdep.c
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/terminal.c
Simple merge

diff --cc src/verbose.mk.in
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge