Merge branch 'MDL-57793-master' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 24 Apr 2017 07:16:30 +0000 (15:16 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 24 Apr 2017 07:16:30 +0000 (15:16 +0800)

Trivial merge