From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 30 Oct 2018 00:49:56 +0000 (+0800)
Subject: Merge branch 'MDL-63656-master' of git://github.com/mickhawkins/moodle
X-Git-Tag: v3.6.0-beta~178
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=e22214b965151b91b99a664655c5da5caabafd36

Merge branch 'MDL-63656-master' of git://github.com/mickhawkins/moodle
---

e22214b965151b91b99a664655c5da5caabafd36