Merge branch 'MDL-59970-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 05:52:49 +0000 (18:52 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 05:52:49 +0000 (18:52 +1300)

Trivial merge