From: David Monllao <davidm@moodle.com>
Date: Tue, 10 May 2016 13:41:15 +0000 (+0800)
Subject: Merge branch 'MDL-52133-master' of git://github.com/ryanwyllie/moodle
X-Git-Tag: v3.1.0-rc1~67
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=677e6345c2e969f78e2d4f9c15365e81d2be8097

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

677e6345c2e969f78e2d4f9c15365e81d2be8097