Merge branch 'MDL-62361' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 11:52:30 +0000 (13:52 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:25 +0000 (09:17 +0800)

Trivial merge