Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 11 Oct 2017 03:07:14 +0000 (11:07 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 11 Oct 2017 03:07:14 +0000 (11:07 +0800)

Trivial merge