Merge branch 'MDL-64330-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 27 May 2019 07:20:31 +0000 (15:20 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 27 May 2019 07:20:31 +0000 (15:20 +0800)

Trivial merge