Merge remote-tracking branch 'upstream/master'

Conflicts:
	TeX.gitignore

diff --cc TeX.gitignore
index 8ec3d8ba715701c532e83936cefa1b67225ca284,1b3dec1c736e451a40df1351c40fbff36df95761..cdc72116dc27c4df10e578fe4dca4ae52b0bce89
--- 1/TeX.gitignore
--- 2/TeX.gitignore
+++ b/TeX.gitignore
@@@ -116,20 -128,38 +129,45 @@@ _minted
  *.sympy
  sympy-plots-for-*.tex/
  
 -#pythontex
+ # pdfcomment
+ *.upa
+ *.upb
+ 
 -# Texpad
 -.texpadtmp
 -
++# pythontex
+ *.pytxcode
+ pythontex-files-*/
+ 
+ # TikZ & PGF
+ *.dpth
+ *.md5
+ *.auxlock
+ 
  # todonotes
  *.tdo
  
  # xindy
  *.xdy
  
- ## Editors
+ # xypic precompiled matrices
+ *.xyc
+ 
 -# WinEdt
 -*.bak
 -*.sav
 -
+ # endfloat
+ *.ttt
+ *.fff
  
+ # Latexian
+ TSWLatexianTemp*
++
++## Editors:
 +# WinEdt
 +*.bak
 +*.sav
 +
++# Texpad
++.texpadtmp
++
 +# Kile
 +*.backup
 +
 +# KBibTeX
 +*~*