Merge branch 'MDL-60341_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Aug 2019 13:46:09 +0000 (15:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Aug 2019 13:46:09 +0000 (15:46 +0200)

Trivial merge