Merge branch 'master' into latex_doc_felix
Refactor.
Again.
Merge branch 'latex_doc_felix'
Merge branch 'LaTeX_documentation_holzi'
Merge branch 'master' into LaTeX_documentation_holzi