Merge branch 'MDL-61862-master' of git://github.com/FMCorz/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Apr 2018 15:30:42 +0000 (23:30 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Apr 2018 15:30:42 +0000 (23:30 +0800)

Trivial merge