Merge branch 'MDL-62188-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 06:50:04 +0000 (14:50 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 06:50:04 +0000 (14:50 +0800)

Trivial merge