Merge branch 'MDL-66139' of https://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 29 Aug 2019 03:51:06 +0000 (11:51 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 29 Aug 2019 03:51:06 +0000 (11:51 +0800)

Trivial merge