Merge branch 'MDL-62852-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Jul 2018 08:38:47 +0000 (16:38 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Jul 2018 08:38:47 +0000 (16:38 +0800)

Trivial merge