Merge branch 'MDL-64032-master-fix' of https://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 8 Aug 2019 02:23:10 +0000 (10:23 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 8 Aug 2019 02:23:10 +0000 (10:23 +0800)

Trivial merge