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