Merge branch 'MDL-66281-master' of git://github.com/junpataleta/moodle
authorSara Arjona <sara@moodle.com>
Mon, 5 Aug 2019 05:41:12 +0000 (13:41 +0800)
committerSara Arjona <sara@moodle.com>
Mon, 5 Aug 2019 05:41:12 +0000 (13:41 +0800)

Trivial merge