Merge branch 'MDL-57570-master' of https://github.com/mwehr/moodle