Merge branch 'MDL-62811' of git://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Jul 2018 08:12:16 +0000 (16:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:51 +0000 (08:46 +0800)

Trivial merge