Merge branch 'MDL-54928-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jul 2016 10:20:07 +0000 (11:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jul 2016 10:20:07 +0000 (11:20 +0100)

Trivial merge