Merge branch 'MDL-65679-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 9 Aug 2019 03:38:59 +0000 (11:38 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 9 Aug 2019 03:38:59 +0000 (11:38 +0800)

Trivial merge