Merge branch 'master_MDL-67980' of https://github.com/golenkovm/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 26 Feb 2020 06:30:49 +0000 (14:30 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 26 Feb 2020 06:30:49 +0000 (14:30 +0800)

Trivial merge