Merge branch 'MDL-62280-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 3 May 2018 02:52:48 +0000 (10:52 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 3 May 2018 02:52:48 +0000 (10:52 +0800)

Trivial merge