Merge branch 'MDL-67154-master' of git://github.com/ferranrecio/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 10 Dec 2019 03:53:29 +0000 (11:53 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 10 Dec 2019 03:53:29 +0000 (11:53 +0800)

Trivial merge