Merge branch 'MDL-53921-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 28 Apr 2016 03:53:31 +0000 (11:53 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:17:53 +0000 (12:17 +0100)

Trivial merge