Merge branch 'MDL-62614-master' of git://github.com/zig-moodle/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 08:12:40 +0000 (16:12 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 08:12:40 +0000 (16:12 +0800)

Trivial merge