Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 14 Aug 2018 08:18:55 +0000 (10:18 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 14 Aug 2018 08:18:55 +0000 (10:18 +0200)

Trivial merge