Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 23 Oct 2017 06:28:51 +0000 (14:28 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 23 Oct 2017 06:28:51 +0000 (14:28 +0800)

Trivial merge