Merge branch 'MDL-60275_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 10 Oct 2017 02:10:09 +0000 (10:10 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 10 Oct 2017 02:10:09 +0000 (10:10 +0800)

Trivial merge