Merge branch 'MDL-61177-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 11 Jan 2018 01:22:24 +0000 (09:22 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 11 Jan 2018 01:22:24 +0000 (09:22 +0800)

Trivial merge