Merge branch 'wip-MDL-59055-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:21:21 +0000 (09:21 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:21:21 +0000 (09:21 +0200)

Trivial merge