Merge branch 'MDL-35667_extra_credit_loop_22' of git://github.com/andyjdavis/moodle...