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