Merge branch 'MDL-62117-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 01:34:37 +0000 (09:34 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 01:34:37 +0000 (09:34 +0800)

Trivial merge