Merge branch 'MDL-63946-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 9 Nov 2018 05:41:44 +0000 (13:41 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 9 Nov 2018 05:41:44 +0000 (13:41 +0800)

Trivial merge