Merge branch 'MDL-52216_master' of https://github.com/eugeneventer/moodle-fixes