Merge branch 'MDL-65787-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 5 Jun 2019 09:24:27 +0000 (17:24 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 5 Jun 2019 09:24:27 +0000 (17:24 +0800)

Trivial merge