From: Dan Poltawski <dan@moodle.com>
Date: Tue, 13 Jun 2017 13:40:06 +0000 (+0100)
Subject: Merge branch 'MDL-59171-master' of git://github.com/junpataleta/moodle
X-Git-Tag: v3.4.0-beta~792
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=7419853951ef03467144eefb3a76186c78208a7c

Merge branch 'MDL-59171-master' of git://github.com/junpataleta/moodle
---

7419853951ef03467144eefb3a76186c78208a7c