Merge branch 'MDL-60958-int-fix-1' of github.com:ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 05:51:55 +0000 (13:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 05:51:55 +0000 (13:51 +0800)

Trivial merge