From: Jun Pataleta <jun@moodle.com>
Date: Tue, 24 Jul 2018 08:24:39 +0000 (+0800)
Subject: Merge branch 'MDL-62919-master' of git://github.com/cescobedo/moodle
X-Git-Tag: v3.6.0-beta~589
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=f7497ace8a1a6e160c17e63cb1c2217fa46ed7b9

Merge branch 'MDL-62919-master' of git://github.com/cescobedo/moodle
---

f7497ace8a1a6e160c17e63cb1c2217fa46ed7b9