Merge branch 'MDL-61307-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 9 Mar 2018 05:36:01 +0000 (13:36 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 9 Mar 2018 05:36:01 +0000 (13:36 +0800)

Trivial merge