Merge branch 'MDL-62257-master' of git://github.com/cescobedo/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 01:35:02 +0000 (09:35 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 01:35:02 +0000 (09:35 +0800)

Trivial merge