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