Merge branch 'MDL-58264' of https://github.com/darrencocco/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 17:02:40 +0000 (18:02 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 17:02:40 +0000 (18:02 +0100)

Trivial merge