Merge branch 'MDL-10965-master' of git://github.com/marinaglancy/moodle
authorDavid Monllaó <davidm@moodle.com>
Wed, 10 Apr 2019 10:42:51 +0000 (12:42 +0200)
committerDavid Monllaó <davidm@moodle.com>
Wed, 10 Apr 2019 10:42:51 +0000 (12:42 +0200)

Trivial merge