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