Merge branch 'MDL-63926-master' of git://github.com/mickhawkins/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 14 Nov 2018 06:23:06 +0000 (14:23 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 14 Nov 2018 06:23:06 +0000 (14:23 +0800)

Trivial merge