Merge branch 'MDL-62117-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 02:19:30 +0000 (10:19 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:54 +0000 (09:15 +0800)

Trivial merge