Merge branch 'wip-MDL-62474-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 06:32:42 +0000 (14:32 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 06:32:42 +0000 (14:32 +0800)

Trivial merge