Merge branch 'MDL-64985-master' of git://github.com/sarjona/moodle
authorDavid Monllaó <davidm@moodle.com>
Wed, 24 Apr 2019 16:13:21 +0000 (18:13 +0200)
committerDavid Monllaó <davidm@moodle.com>
Wed, 24 Apr 2019 16:13:21 +0000 (18:13 +0200)

Trivial merge