Merge branch 'MDL-51528-int-fix-1' of https://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2015 06:15:14 +0000 (14:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2015 06:15:14 +0000 (14:15 +0800)

Trivial merge