From: Jake Dallimore <jake@moodle.com>
Date: Tue, 27 Feb 2018 01:04:45 +0000 (+0800)
Subject: Merge branch 'MDL-61480-master' of git://github.com/andrewnicols/moodle
X-Git-Tag: v3.5.0-beta~376
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c99a5e18ebeb7ace66e50dd1050f7effa92747c1

Merge branch 'MDL-61480-master' of git://github.com/andrewnicols/moodle
---

c99a5e18ebeb7ace66e50dd1050f7effa92747c1