Merge branch 'MDL-54027-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 10:05:06 +0000 (11:05 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 10:05:06 +0000 (11:05 +0100)

Trivial merge