Merge branch 'MDL-54594-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:02:00 +0000 (14:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:02:00 +0000 (14:02 +0800)

Trivial merge