Merge branch 'MDL-31356_master' of https://github.com/StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jul 2016 12:01:34 +0000 (13:01 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jul 2016 12:01:34 +0000 (13:01 +0100)

Trivial merge