Merge branch 'MDL-53247_fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 06:05:00 +0000 (14:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 06:05:00 +0000 (14:05 +0800)

Trivial merge