Merge branch 'MDL-65946-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2019 22:40:28 +0000 (00:40 +0200)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 25 Jul 2019 06:41:15 +0000 (14:41 +0800)

Trivial merge