From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 22 Aug 2018 00:02:47 +0000 (+0800)
Subject: Merge branch 'MDL-62660' of https://github.com/stronk7/moodle
X-Git-Tag: v3.6.0-beta~479
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=d5bf22ecd1eb04d2e0dc3fa5f269a54af057a21b

Merge branch 'MDL-62660' of https://github.com/stronk7/moodle
---

d5bf22ecd1eb04d2e0dc3fa5f269a54af057a21b