Merge branch 'MDL-53661_master' of https://github.com/sam-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Apr 2016 04:19:12 +0000 (12:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Apr 2016 04:19:12 +0000 (12:19 +0800)

Trivial merge