Merge branch 'MDL-57898-master-fix-2' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 21 Jan 2019 07:55:10 +0000 (15:55 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 21 Jan 2019 07:55:10 +0000 (15:55 +0800)

Trivial merge