Merge branch 'master' of https://github.com/fwsl/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 11:07:29 +0000 (12:07 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 11:07:29 +0000 (12:07 +0100)

Trivial merge