Merge branch 'MDL-57898-master-fix-2' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 22 Jan 2019 01:47:05 +0000 (09:47 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 22 Jan 2019 01:47:05 +0000 (09:47 +0800)

Trivial merge