Merge branch 'MDL-45389-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 16 Jul 2018 02:11:40 +0000 (10:11 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 16 Jul 2018 02:11:40 +0000 (10:11 +0800)

Trivial merge