Merge branch 'MDL-62060-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 1 May 2018 02:44:59 +0000 (10:44 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 1 May 2018 02:44:59 +0000 (10:44 +0800)

Trivial merge