Merge branch 'MDL-54009-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 13:58:41 +0000 (21:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 13:58:41 +0000 (21:58 +0800)

Trivial merge