Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle