Merge branch 'MDL-75475-master' of https://github.com/davewoloszyn/moodle