Merge branch 'MDL-62658_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 06:36:54 +0000 (14:36 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 06:36:54 +0000 (14:36 +0800)

Trivial merge