Merge branch 'MDL-35987-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 May 2016 05:38:52 +0000 (13:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 May 2016 05:38:52 +0000 (13:38 +0800)

Trivial merge