Merge branch 'MDL-61307-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 14 Mar 2018 01:41:00 +0000 (09:41 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 14 Mar 2018 01:41:00 +0000 (09:41 +0800)

Trivial merge