Merge branch 'MDL-50011-master' of https://github.com/nwp90/moodle