Merge branch 'MDL-59165-master-2' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 4 Jul 2017 01:16:11 +0000 (09:16 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 4 Jul 2017 01:16:11 +0000 (09:16 +0800)

Trivial merge