Merge branch 'MDL-62176-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 03:00:17 +0000 (11:00 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 03:00:17 +0000 (11:00 +0800)

Trivial merge