Merge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 28 Apr 2016 13:29:39 +0000 (14:29 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:18:05 +0000 (12:18 +0100)

Trivial merge