Merge branch 'MDL-62172-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 27 Apr 2018 01:55:08 +0000 (09:55 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 27 Apr 2018 01:55:08 +0000 (09:55 +0800)

Trivial merge