Merge branch 'wip-MDL-53923-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 May 2016 08:31:45 +0000 (09:31 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:08 +0000 (17:16 +0800)

Trivial merge