Merge branch 'MDL-61110_master' of https://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 07:59:06 +0000 (09:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 07:59:06 +0000 (09:59 +0200)

Trivial merge