Merge branch 'MDL-62931-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 30 Jul 2018 08:34:57 +0000 (16:34 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Jul 2018 08:34:57 +0000 (16:34 +0800)

Trivial merge