From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 15 Nov 2016 00:05:54 +0000 (+0800)
Subject: Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle
X-Git-Tag: v3.2.0-rc1~53^2~12
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=181b5922ce29b9f7527a1a0361957971d4c12593;hp=--cc

Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle
---

181b5922ce29b9f7527a1a0361957971d4c12593