Merge branch 'MDL-50532-master' of git://github.com/FMCorz/moodle