Merge branch 'MDL-52218_master_alt' of git://github.com/markn86/moodle