Merge branch 'MDL-63999-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 16 Nov 2018 06:36:14 +0000 (14:36 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 16 Nov 2018 06:36:14 +0000 (14:36 +0800)

Trivial merge