Merge branch 'MDL-62162-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 02:25:33 +0000 (10:25 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 02:25:33 +0000 (10:25 +0800)

Trivial merge