Merge branch 'MDL-53095-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 10:49:50 +0000 (11:49 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 10:49:50 +0000 (11:49 +0100)

Trivial merge