Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 7 Nov 2017 08:03:43 +0000 (16:03 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 7 Nov 2017 08:03:43 +0000 (16:03 +0800)

Trivial merge