Merge branch 'MDL-62269-master' of git://github.com/vmdef/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 10:32:54 +0000 (18:32 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:16:00 +0000 (09:16 +0800)

Trivial merge