Merge branch 'MDL-37476-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...