Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 22 Apr 2016 05:23:16 +0000 (13:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 22 Apr 2016 05:23:16 +0000 (13:23 +0800)

Trivial merge