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