Merge branch 'MDL-60700-int-fix-1' of github.com:ryanwyllie/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 7 Nov 2017 07:44:12 +0000 (15:44 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 7 Nov 2017 07:44:12 +0000 (15:44 +0800)

Trivial merge