Merge branch 'MDL-61932-master' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 23 May 2018 02:01:08 +0000 (10:01 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 23 May 2018 02:01:08 +0000 (10:01 +0800)

Trivial merge