Merge branch 'MDL-61862-master' of git://github.com/FMCorz/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 17 Apr 2018 04:07:49 +0000 (12:07 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 17 Apr 2018 04:07:49 +0000 (12:07 +0800)

Trivial merge