Merge branch 'MDL-58796-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 5 May 2017 04:01:06 +0000 (12:01 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 5 May 2017 04:01:06 +0000 (12:01 +0800)

Trivial merge