Merge branch 'MDL-65636' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 22 May 2019 11:36:11 +0000 (19:36 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 22 May 2019 11:36:11 +0000 (19:36 +0800)

Trivial merge