Merge branch 'wip-MDL-60280-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 11:46:19 +0000 (13:46 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 11:46:19 +0000 (13:46 +0200)

Trivial merge