Merge branch 'MDL-63902-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 8 Nov 2018 05:39:05 +0000 (13:39 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 8 Nov 2018 05:39:05 +0000 (13:39 +0800)

Trivial merge