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

Trivial merge