Minor fix
Reapply aurelie's changes
Merge branch 'master' into doc_gh