Merge branch 'MDL-62048_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 20 Apr 2018 03:53:37 +0000 (11:53 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 20 Apr 2018 03:53:37 +0000 (11:53 +0800)

Trivial merge