Merge branch 'MDL-58047-master-fix1' of http://github.com/damyon/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 3 Nov 2017 08:09:29 +0000 (16:09 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 3 Nov 2017 08:09:29 +0000 (16:09 +0800)

Trivial merge