Merge branch 'MDL-37624-master-fix' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 08:40:29 +0000 (16:40 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 08:40:29 +0000 (16:40 +0800)

Trivial merge