Merge branch 'master' into olefix
Compiled pdfs again