Merge branch 'MDL-61937_master-fix' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 7 May 2018 01:37:55 +0000 (09:37 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 7 May 2018 01:37:55 +0000 (09:37 +0800)

Trivial merge