Merge branch 'MDL-62949-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 23 Jul 2018 06:55:18 +0000 (14:55 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 23 Jul 2018 06:55:18 +0000 (14:55 +0800)

Trivial merge