Merge branch 'MDL-63028-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Aug 2018 10:48:41 +0000 (12:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Aug 2018 10:48:41 +0000 (12:48 +0200)

Trivial merge