Merge branch 'MDL-62273-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 6 Jun 2018 09:12:48 +0000 (11:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:41 +0000 (11:16 +0200)

Trivial merge