Fixes #158 better
Merge remote-tracking branch 'origin/master' into t164_fold_in_research_guides