Merge branch 'MDL-58543' of git://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 10 Apr 2017 04:36:56 +0000 (12:36 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 10 Apr 2017 04:36:56 +0000 (12:36 +0800)

Trivial merge