Merge branch 'MDL-62248-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 13:23:14 +0000 (21:23 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 13:23:14 +0000 (21:23 +0800)

Trivial merge