Merge branch 'MDL-43385-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Feb 2019 08:37:20 +0000 (16:37 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 5 Feb 2019 08:37:20 +0000 (16:37 +0800)

Trivial merge