Merge branch 'mdl55456-master' of https://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 21:26:05 +0000 (21:26 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 21:26:05 +0000 (21:26 +0000)

Trivial merge