Merge remote-tracking branch 'git-svn-tags'
Merge remote-tracking branch 'origin/master'
Makefile - latexmk-ify