Merge branch 'MDL-60924-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 07:38:04 +0000 (09:38 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 07:38:04 +0000 (09:38 +0200)

Trivial merge