Merge branch 'MDL-62834-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 02:44:51 +0000 (10:44 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 02:44:51 +0000 (10:44 +0800)

Trivial merge