Merge branch 'wip_MDL-53029_master' of git://github.com/gjb2048/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 11:07:38 +0000 (11:07 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 11:07:38 +0000 (11:07 +0000)

Trivial merge