Merge branch 'MDL-59364-master-fix2' of http://github.com/damyon/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 6 Jul 2017 06:48:05 +0000 (14:48 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 6 Jul 2017 06:48:05 +0000 (14:48 +0800)

Trivial merge