Merge branch 'MDL-77561-master' of https://github.com/lameze/moodle