Merge branch 'MDL-50312_master' of https://github.com/jinhofer/moodle