From: Jun Pataleta <jun@moodle.com>
Date: Wed, 25 Jul 2018 08:38:47 +0000 (+0800)
Subject: Merge branch 'MDL-62852-master' of git://github.com/sarjona/moodle
X-Git-Tag: v3.6.0-beta~574
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=6830ae12c7d6101edc62987fcabe825252ab7bfc

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

6830ae12c7d6101edc62987fcabe825252ab7bfc