From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 2 Aug 2017 05:39:23 +0000 (+0800)
Subject: Merge branch 'MDL-57259-master' of git://github.com/ryanwyllie/moodle
X-Git-Tag: v3.4.0-beta~511
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=9bed446559ec478a8c022f932c6fa9dff986a902

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

9bed446559ec478a8c022f932c6fa9dff986a902