Merge branch 'MDL-62253-master' of git://github.com/FMCorz/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 05:53:43 +0000 (13:53 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 05:53:43 +0000 (13:53 +0800)

Trivial merge