Merge branch 'MDL-67696-master' of https://github.com/JayChurchward/moodle
authorSara Arjona <sara@moodle.com>
Wed, 4 Mar 2020 16:55:27 +0000 (17:55 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 4 Mar 2020 16:55:27 +0000 (17:55 +0100)

Trivial merge