Merge branch 'MDL-53883_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 05:00:29 +0000 (13:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 05:00:29 +0000 (13:00 +0800)

Trivial merge