Merge branch 'MDL-61015-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 22 May 2018 00:14:52 +0000 (08:14 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 22 May 2018 00:14:52 +0000 (08:14 +0800)

Trivial merge