Merge branch 'MDL-52825_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 28 Jan 2016 04:01:31 +0000 (12:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:26 +0000 (10:15 +0800)

Trivial merge