Merge branch 'MDL-43648-int-fix-1' of github.com:ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Jan 2018 02:38:20 +0000 (10:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Jan 2018 02:38:20 +0000 (10:38 +0800)

Trivial merge