Merge branch 'wip-MDL-53402-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 May 2016 05:02:15 +0000 (13:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 May 2016 05:02:15 +0000 (13:02 +0800)

Trivial merge