Merge branch 'MDL-60978-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 26 Jun 2019 05:16:36 +0000 (13:16 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 26 Jun 2019 05:16:36 +0000 (13:16 +0800)

Trivial merge