Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 10 Oct 2017 05:30:34 +0000 (13:30 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 10 Oct 2017 05:30:34 +0000 (13:30 +0800)

Trivial merge