Merge branch 'wip_MDL-50690_master' of git://github.com/gjb2048/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 19:59:58 +0000 (20:59 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 19:59:58 +0000 (20:59 +0100)

Trivial merge