Merge branch 'MDL-63194' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 9 Oct 2018 00:56:02 +0000 (08:56 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 9 Oct 2018 00:56:02 +0000 (08:56 +0800)

Trivial merge