Merge branch 'MDL-62418-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 01:01:29 +0000 (03:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 01:01:29 +0000 (03:01 +0200)

Trivial merge