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