From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 23 Apr 2018 08:03:13 +0000 (+0800)
Subject: Merge branch 'MDL-62055-master' of git://github.com/sarjona/moodle
X-Git-Tag: v3.5.0-beta~27
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=6de5bbb8cd63a32b059e2dfa0ac08751f305e297

Merge branch 'MDL-62055-master' of git://github.com/sarjona/moodle
---

6de5bbb8cd63a32b059e2dfa0ac08751f305e297