From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 2 Nov 2018 00:56:40 +0000 (+0800)
Subject: Merge branch 'MDL-63703-master-1' of git://github.com/mihailges/moodle
X-Git-Tag: v3.6.0-beta~135
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=ec859d9f4b3abe4a52302d3e1108b5270a7df65c

Merge branch 'MDL-63703-master-1' of git://github.com/mihailges/moodle
---

ec859d9f4b3abe4a52302d3e1108b5270a7df65c