Merge branch 'MDL-54847-master-fix' of git://github.com/cameron1729/moodle