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