Merge branch 'MDL-60207-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 14 Jun 2018 02:29:11 +0000 (10:29 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 14 Jun 2018 02:29:11 +0000 (10:29 +0800)

Trivial merge