Merge branch 'wip-MDL-63165-master' of https://github.com/Beedell/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 28 Aug 2018 10:28:25 +0000 (12:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 28 Aug 2018 10:28:25 +0000 (12:28 +0200)

Trivial merge