From: David Monllao <davidm@moodle.com>
Date: Thu, 3 May 2018 08:24:02 +0000 (+0200)
Subject: Merge branch 'MDL-61693-master' of git://github.com/zig-moodle/moodle
X-Git-Tag: v3.5.0-rc1~149
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=3128529784bed259a954ff0afeed31dc74811e74

Merge branch 'MDL-61693-master' of git://github.com/zig-moodle/moodle
---

3128529784bed259a954ff0afeed31dc74811e74