Merge branch 'wip-MDL-62574-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Jun 2018 03:57:01 +0000 (11:57 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Jun 2018 03:57:01 +0000 (11:57 +0800)

Trivial merge