From: Jake Dallimore <jake@moodle.com>
Date: Tue, 3 Apr 2018 09:53:13 +0000 (+0800)
Subject: Merge branch 'wip-MDL-61815-master' of git://github.com/abgreeve/moodle
X-Git-Tag: v3.5.0-beta~238
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=f16b871fe2ca7b1fcf9905cc08a127797c1851bf

Merge branch 'wip-MDL-61815-master' of git://github.com/abgreeve/moodle
---

f16b871fe2ca7b1fcf9905cc08a127797c1851bf