Merge branch 'MDL-64064' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Oct 2019 21:08:58 +0000 (23:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Oct 2019 21:08:58 +0000 (23:08 +0200)

Trivial merge