Merge branch 'MDL-57042-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:00:45 +0000 (18:00 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:00:45 +0000 (18:00 +0000)

Trivial merge