Merge branch 'MDL-65247-master' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 3 Apr 2019 05:46:05 +0000 (13:46 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 3 Apr 2019 05:46:05 +0000 (13:46 +0800)

Trivial merge