Merge branch 'MDL-59382-int-fix-1' of github.com:ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Aug 2017 06:53:25 +0000 (14:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Aug 2017 06:53:25 +0000 (14:53 +0800)

Trivial merge