From: Jun Pataleta <jun@moodle.com>
Date: Fri, 11 May 2018 04:06:03 +0000 (+0800)
Subject: Merge branch 'MDL-62382-master' of git://github.com/ryanwyllie/moodle
X-Git-Tag: v3.5.0-rc1~43
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=44d89dfa7a933796f06d195ef0d703691a625612

Merge branch 'MDL-62382-master' of git://github.com/ryanwyllie/moodle
---

44d89dfa7a933796f06d195ef0d703691a625612