Merge branch 'MDL-41463-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 04:59:00 +0000 (12:59 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 04:59:00 +0000 (12:59 +0800)

Trivial merge