Merge branch 'MDL-64684-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Feb 2019 03:40:26 +0000 (11:40 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Feb 2019 03:40:26 +0000 (11:40 +0800)

Trivial merge