Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 11:08:08 +0000 (11:08 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 11:08:08 +0000 (11:08 +0000)

Trivial merge