Merge branch 'MDL-38829-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 8 Mar 2018 03:17:05 +0000 (11:17 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 8 Mar 2018 03:17:05 +0000 (11:17 +0800)

Trivial merge