Merge branch 'MDL-65212-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 3 May 2019 02:55:05 +0000 (10:55 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 3 May 2019 02:55:05 +0000 (10:55 +0800)

Trivial merge