Merge branch 'wip-MDL-59992-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 10:23:22 +0000 (11:23 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:13 +0000 (10:50 +0200)

Trivial merge