Merge branch 'MDL-62307_master' of https://github.com/maksudr/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 Apr 2019 08:50:31 +0000 (16:50 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 Apr 2019 08:50:31 +0000 (16:50 +0800)

Trivial merge