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

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

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

diff --cc lisp/progmodes/cperl-mode.el
Simple merge