Merge branch 'MDL-62988_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 22 Nov 2018 22:15:54 +0000 (23:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 22 Nov 2018 22:15:54 +0000 (23:15 +0100)

Trivial merge