From: David Monllao <davidm@moodle.com>
Date: Wed, 28 Sep 2016 00:37:48 +0000 (+0800)
Subject: Merge branch 'MDL-56072-master' of git://github.com/cameron1729/moodle
X-Git-Tag: v3.2.0-beta~471
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=bdab41d71b45d7bc8ca8ae032d96d607a17045ea

Merge branch 'MDL-56072-master' of git://github.com/cameron1729/moodle
---

bdab41d71b45d7bc8ca8ae032d96d607a17045ea