Merge branch 'wip-MDL-59311-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:45:35 +0000 (14:45 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:45:35 +0000 (14:45 +0200)

Trivial merge