Merge branch 'MDL-58200-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 06:13:32 +0000 (19:13 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 06:13:32 +0000 (19:13 +1300)

Trivial merge