Merge branch 'MDL-60578-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 4 Sep 2018 13:18:02 +0000 (21:18 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Sep 2018 13:18:02 +0000 (21:18 +0800)

Trivial merge