Merge branch 'MDL-63097' of git://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 20 Aug 2018 05:51:50 +0000 (13:51 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 20 Aug 2018 05:51:50 +0000 (13:51 +0800)

Trivial merge