Merge branch 'MDL-61711' of git://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 9 Apr 2018 08:19:44 +0000 (16:19 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 9 Apr 2018 08:19:44 +0000 (16:19 +0800)

Trivial merge