Merge branch 'MDL-52489_master' of git://github.com/markn86/moodle