Merge branch 'MDL-64745-master-1' of git://github.com/mihailges/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 9 Oct 2019 07:58:50 +0000 (15:58 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 9 Oct 2019 07:58:50 +0000 (15:58 +0800)

Trivial merge