Merge branch 'MDL-62025_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 07:50:09 +0000 (15:50 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 07:50:09 +0000 (15:50 +0800)

Trivial merge