Merge branch 'MDL-52132-master' of git://github.com/rezaies/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 23 Jan 2019 01:20:27 +0000 (09:20 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 23 Jan 2019 01:20:27 +0000 (09:20 +0800)

Trivial merge