Merge branch 'MDL-51451-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2015 02:10:51 +0000 (10:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2015 02:10:51 +0000 (10:10 +0800)

Trivial merge