Merge branch 'MDL-64274-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 5 Dec 2018 06:56:21 +0000 (14:56 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 5 Dec 2018 06:56:21 +0000 (14:56 +0800)

Trivial merge