Make use of YAML series in courses
Merge branch 'master' into f.aggregate_shellq
Cosmetic changes