Merge branch 'MDL-55861-master' of https://github.com/dj4452/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 14:43:51 +0000 (15:43 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 14:43:51 +0000 (15:43 +0100)

Trivial merge