Merge branch 'MDL-62025_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 08:26:26 +0000 (16:26 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 08:26:26 +0000 (16:26 +0800)

Trivial merge