Merge branch 'MDL-60897-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 31 Oct 2018 03:34:54 +0000 (11:34 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 31 Oct 2018 03:34:54 +0000 (11:34 +0800)

Trivial merge