Merge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 02:10:38 +0000 (10:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 02:10:38 +0000 (10:10 +0800)

Trivial merge