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