Merge branch 'MDL-54920-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 06:15:41 +0000 (14:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 06:15:41 +0000 (14:15 +0800)

Trivial merge