Merge branch 'MDL-61882-master' of git://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 01:38:27 +0000 (09:38 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 01:38:27 +0000 (09:38 +0800)

Trivial merge