From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 7 Aug 2018 04:19:44 +0000 (+0800)
Subject: Merge branch 'MDL-54741-master' of git://github.com/mihailges/moodle
X-Git-Tag: v3.6.0-beta~528
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=4af25b000fd06c282780b4a22b019b108d8b4ce8

Merge branch 'MDL-54741-master' of git://github.com/mihailges/moodle
---

4af25b000fd06c282780b4a22b019b108d8b4ce8