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

Trivial merge