Merge branch 'MDL-62560-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 23 Oct 2018 01:22:14 +0000 (09:22 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 23 Oct 2018 01:22:14 +0000 (09:22 +0800)

Trivial merge