Merge branch 'MDL-62594-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Jun 2018 05:55:43 +0000 (13:55 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Jun 2018 05:55:43 +0000 (13:55 +0800)

Trivial merge