Merge branch 'MDL-52530' of git://github.com/eugeneventer/moodle-fixes