Merge branch 'MDL-53859_master' of https://github.com/StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Apr 2016 09:31:00 +0000 (10:31 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Apr 2016 09:31:00 +0000 (10:31 +0100)

Trivial merge