Merge branch 'wip-MDL-54962-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 14:15:48 +0000 (16:15 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 14:15:48 +0000 (16:15 +0200)

Trivial merge