Merge branch 'master' into latex_doc_felix
Merge branch 'latex_doc_felix'