Merge branch 'MDL-53272_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 07:44:17 +0000 (08:44 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 07:44:17 +0000 (08:44 +0100)

Trivial merge