From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 23 Jul 2018 06:29:55 +0000 (+0800)
Subject: Merge branch 'MDL-54742-master' of git://github.com/mihailges/moodle
X-Git-Tag: v3.6.0-beta~595
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=a6034c9611514418d39983ac6520504f581794dd

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

a6034c9611514418d39983ac6520504f581794dd