Merge branch 'MDL-66110-master' of https://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 21 Aug 2019 01:57:49 +0000 (09:57 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 21 Aug 2019 01:57:49 +0000 (09:57 +0800)

Trivial merge