Merge branch 'MDL-61971-master' of git://github.com/mickhawkins/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 08:23:22 +0000 (16:23 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 08:23:22 +0000 (16:23 +0800)

Trivial merge