Merge branch 'MDL-61649-master' of git://github.com/aanabit/moodle
authorSara Arjona <sara@moodle.com>
Wed, 7 Aug 2019 05:33:04 +0000 (13:33 +0800)
committerSara Arjona <sara@moodle.com>
Wed, 7 Aug 2019 05:33:04 +0000 (13:33 +0800)

Trivial merge