Merge branch 'MDL-55627' of https://github.com/bostelm/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 13:09:09 +0000 (14:09 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 13:09:09 +0000 (14:09 +0100)

Trivial merge