Merge branch 'MDL-58411-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 3 Apr 2018 08:44:43 +0000 (16:44 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 3 Apr 2018 08:44:43 +0000 (16:44 +0800)

Trivial merge