From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 24 Apr 2018 00:45:30 +0000 (+0800)
Subject: Merge branch 'MDL-61651_master' of git://github.com/markn86/moodle
X-Git-Tag: v3.5.0-beta~14
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c131b9600071d610f2e35276199aeab59848d053

Merge branch 'MDL-61651_master' of git://github.com/markn86/moodle
---

c131b9600071d610f2e35276199aeab59848d053