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