Merge branch 'MDL-372-int-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 02:22:24 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 02:22:24 +0000 (10:22 +0800)

Trivial merge