Merge branch 'MDL-62056-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 13:20:46 +0000 (15:20 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:28 +0000 (09:17 +0800)

Trivial merge