Merge branch 'MDL-62781-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Jul 2018 02:07:45 +0000 (10:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:49 +0000 (08:46 +0800)

Trivial merge