Merge branch 'MDL-44538-master' of https://github.com/lucaboesch/moodle