Merge branch 'wip-MDL-55107-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 11:03:19 +0000 (13:03 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 11:03:19 +0000 (13:03 +0200)

Trivial merge