Merge branch 'MDL-58563-master' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 11 Apr 2017 07:09:27 +0000 (15:09 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 11 Apr 2017 07:09:27 +0000 (15:09 +0800)

Trivial merge