Merge branch 'MDL-61994-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 09:11:36 +0000 (11:11 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:58 +0000 (09:15 +0800)

Trivial merge