Merge branch 'wip-MDL-59496-master-3' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 15:14:56 +0000 (17:14 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 15:14:56 +0000 (17:14 +0200)

Trivial merge