Merge branch 'MDL-33105' of https://github.com/ppichet/moodle