Merge branch 'MDL-53382' of https://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 20 Apr 2016 03:29:57 +0000 (11:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 20 Apr 2016 03:29:57 +0000 (11:29 +0800)

Trivial merge