Merge branch 'MDL-62919-master' of git://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 24 Jul 2018 08:24:39 +0000 (16:24 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Jul 2018 08:24:39 +0000 (16:24 +0800)

Trivial merge