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