Merge branch 'MDL-61480-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 27 Feb 2018 01:04:45 +0000 (09:04 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 27 Feb 2018 01:04:45 +0000 (09:04 +0800)

Trivial merge