Merge branch 'MDL-66244-master' of git://github.com/jleyva/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 28 Aug 2019 09:42:07 +0000 (17:42 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 28 Aug 2019 09:42:07 +0000 (17:42 +0800)

Trivial merge