Merge branch 'MDL-37138-master-2' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 07:02:17 +0000 (15:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 07:02:17 +0000 (15:02 +0800)

Trivial merge