Merge branch 'MDL-62049_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 05:54:38 +0000 (13:54 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 05:54:38 +0000 (13:54 +0800)

Trivial merge