Merge remote-tracking branch 'upstream/master'

diff --cc Global/Emacs.gitignore
index f4e7fe7921c89d213f7b75c602081434ea99f813,95e09ebafb30397943cf7052ff45b353b082e8cd..43632ff1dbe7a4647cfbfd1811c388b9a116be88
--- 1/Global/Emacs.gitignore
--- 2/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@@ -31,5 -31,5 +31,8 @@@ tram
  # cask packages
  .cask/
  
 +# Flycheck
 +flycheck_*.el
++
+ # server auth directory
+ /server/