Merge branch 'MDL-64652-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Mar 2019 03:14:04 +0000 (11:14 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 5 Mar 2019 03:14:04 +0000 (11:14 +0800)

Trivial merge