Merge branch 'MDL-54680-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Aug 2016 06:45:33 +0000 (14:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Aug 2016 06:45:33 +0000 (14:45 +0800)

Trivial merge