Merge branch 'MDL-41497-master' of https://github.com/willylee/moodle