Merge branch 'MDL-65141-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 9 May 2019 04:29:25 +0000 (12:29 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 9 May 2019 04:29:25 +0000 (12:29 +0800)

Trivial merge