Merge branch 'MDL-62394-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 06:23:41 +0000 (14:23 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 06:23:41 +0000 (14:23 +0800)

Trivial merge