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

Trivial merge