Merge branch 'MDL-62383-master' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 02:03:32 +0000 (10:03 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 02:03:32 +0000 (10:03 +0800)

Trivial merge