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