Merge branch 'MDL-64736-master-2' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 14 Feb 2019 07:00:56 +0000 (15:00 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 14 Feb 2019 07:00:56 +0000 (15:00 +0800)

Trivial merge