Merge branch 'MDL-64000-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 30 Nov 2018 08:13:38 +0000 (16:13 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 30 Nov 2018 08:13:38 +0000 (16:13 +0800)

Trivial merge