From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 9 Jul 2018 05:29:29 +0000 (+0800)
Subject: Merge branch 'MDL-62808_master' of git://github.com/markn86/moodle
X-Git-Tag: v3.6.0-beta~645
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=a31b3cf30b1e4aad5d995c0df0aa4f51a0c773b1

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

a31b3cf30b1e4aad5d995c0df0aa4f51a0c773b1