Merge branch 'MDL-26571_lesson_scale' of git://github.com/andyjdavis/moodle