Merge branch 'MDL-62500-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 May 2018 11:37:16 +0000 (13:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 May 2018 11:37:16 +0000 (13:37 +0200)

Trivial merge