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