Merge branch 'MDL-64099-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 27 Nov 2018 02:53:04 +0000 (10:53 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 27 Nov 2018 02:53:04 +0000 (10:53 +0800)

Trivial merge