From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 9 May 2018 10:32:54 +0000 (+0800)
Subject: Merge branch 'MDL-62269-master' of git://github.com/vmdef/moodle
X-Git-Tag: v3.5.0-rc1~78
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=270cefc4b090081320101d800e24606732eb71ee

Merge branch 'MDL-62269-master' of git://github.com/vmdef/moodle
---

270cefc4b090081320101d800e24606732eb71ee