Merge branch 'MDL-63897-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 9 Nov 2018 03:30:28 +0000 (11:30 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 9 Nov 2018 03:30:28 +0000 (11:30 +0800)

Trivial merge