Merge branch 'MDL-62005-master' of git://github.com/rezaies/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 1 May 2018 01:10:18 +0000 (09:10 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 1 May 2018 01:10:18 +0000 (09:10 +0800)

Trivial merge