Merge branch 'mdl63334-master' of https://github.com/tlock/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 3 Oct 2018 15:19:18 +0000 (17:19 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 3 Oct 2018 15:19:18 +0000 (17:19 +0200)

Trivial merge