Merge branch 'MDL-63876-master-fix' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 29 Mar 2019 04:15:00 +0000 (12:15 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 29 Mar 2019 04:15:00 +0000 (12:15 +0800)

Trivial merge